Merge from trunk.
authorStephen Berman <stephen.berman@gmx.net>
Fri, 14 Jun 2013 20:07:55 +0000 (22:07 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 14 Jun 2013 20:07:55 +0000 (22:07 +0200)
commit6e744a055631c5a876ede8fc8030575cc11a7f5b
tree8b4caab89aff83c07227e0737aad0dfcb35abeef
parent858ec7d1c357ac7f80c8e00296d8192f5c1eaed8
parent43ccc3e936415a03893e3f5b8175f6226e224278
Merge from trunk.